Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 19:11:46 +0000 (12:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 19:11:46 +0000 (12:11 -0700)
commit830f5732404417084029955c94e9eaf7367ab693
treecb005c9f8394a6157b258b0ef88030460b9b7866
parent6c968b9dcc64c25fc792e4eb8a786d6bcc0a869f
parentb1934cb9af8546f73cb38d18cc0042405b7f7610
Merge from trunk.
src/ChangeLog
src/xterm.c